bitkeeper revision 1.1159.170.75 (41d452b0ThWwqJLrhyUjZvsHEZe3FA)
authorsmh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk>
Thu, 30 Dec 2004 19:10:40 +0000 (19:10 +0000)
committersmh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk>
Thu, 30 Dec 2004 19:10:40 +0000 (19:10 +0000)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/testing/xen-2.0-testing.bk


Trivial merge